From e01eacc981a8b50e84519407b22928df67766074 Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Wed, 3 Feb 2010 16:27:04 +0000 Subject: [PATCH] follow-up r61917 - stylize for coding conventions --- tests/MediaWikiAPITest.php | 70 +++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/tests/MediaWikiAPITest.php b/tests/MediaWikiAPITest.php index 95ca074d5e..a08a9c97ae 100644 --- a/tests/MediaWikiAPITest.php +++ b/tests/MediaWikiAPITest.php @@ -1,6 +1,6 @@ assertNotType("bool", $sxe); - $this->assertThat($sxe, $this->isInstanceOf("SimpleXMLElement")); + libxml_use_internal_errors( true ); + $sxe = simplexml_load_string( $resp ); + $this->assertNotType( "bool", $sxe ); + $this->assertThat( $sxe, $this->isInstanceOf( "SimpleXMLElement" ) ); } function testApiLoginNoName() { - $resp = Http::post(self::$apiUrl."?action=login&format=xml", - array("postData" => array( - "lgname" => "", - "lgpassword" => self::$passWord))); - libxml_use_internal_errors(true); - $sxe = simplexml_load_string($resp); - $this->assertNotType("bool", $sxe); - $this->assertThat($sxe, $this->isInstanceOf("SimpleXMLElement")); + $resp = Http::post( self::$apiUrl . "?action=login&format=xml", + array( "postData" => array( + "lgname" => "", + "lgpassword" => self::$passWord ) ) ); + libxml_use_internal_errors( true ); + $sxe = simplexml_load_string( $resp ); + $this->assertNotType( "bool", $sxe ); + $this->assertThat( $sxe, $this->isInstanceOf( "SimpleXMLElement" ) ); $a = $sxe->login[0]->attributes()->result; $this->assertEquals( ' result="NoName"', $a->asXML() ); } function testApiLoginBadPass() { - $resp = Http::post(self::$apiUrl."?action=login&format=xml", - array("postData" => array( - "lgname" => self::$userName, - "lgpassword" => "bad"))); - libxml_use_internal_errors(true); - $sxe = simplexml_load_string($resp); - $this->assertNotType("bool", $sxe); - $this->assertThat($sxe, $this->isInstanceOf("SimpleXMLElement")); + $resp = Http::post( self::$apiUrl . "?action=login&format=xml", + array( "postData" => array( + "lgname" => self::$userName, + "lgpassword" => "bad" ) ) ); + libxml_use_internal_errors( true ); + $sxe = simplexml_load_string( $resp ); + $this->assertNotType( "bool", $sxe ); + $this->assertThat( $sxe, $this->isInstanceOf( "SimpleXMLElement" ) ); $a = $sxe->login[0]->attributes()->result; $this->assertEquals( ' result="WrongPass"', $a->asXML() ); } function testApiLoginGoodPass() { - $resp = Http::post(self::$apiUrl."?action=login&format=xml", - array("postData" => array( - "lgname" => self::$userName, - "lgpassword" => self::$passWord))); - libxml_use_internal_errors(true); - $sxe = simplexml_load_string($resp); - $this->assertNotType("bool", $sxe); - $this->assertThat($sxe, $this->isInstanceOf("SimpleXMLElement")); + $resp = Http::post( self::$apiUrl . "?action=login&format=xml", + array( "postData" => array( + "lgname" => self::$userName, + "lgpassword" => self::$passWord ) ) ); + libxml_use_internal_errors( true ); + $sxe = simplexml_load_string( $resp ); + $this->assertNotType( "bool", $sxe ); + $this->assertThat( $sxe, $this->isInstanceOf( "SimpleXMLElement" ) ); $a = $sxe->login[0]->attributes()->result; $this->assertEquals( ' result="Success"', $a->asXML() ); } @@ -60,15 +60,15 @@ class MediaWikiAPITest extends MediaWikiAPI_TestCase { function testApiGotCookie() { global $wgScriptPath, $wgServerName; - $req = HttpRequest::factory(self::$apiUrl."?action=login&format=xml", - array("method" => "POST", + $req = HttpRequest::factory( self::$apiUrl . "?action=login&format=xml", + array( "method" => "POST", "postData" => array( "lgname" => self::$userName, - "lgpassword" => self::$passWord))); + "lgpassword" => self::$passWord ) ) ); $req->execute(); $cj = $req->getCookieJar(); - $this->assertRegexp( '/_session=[^;]*; .*UserID=[0-9]*; .*UserName='.self::$userName.'; .*Token=/', - $cj->serializeToHttpRequest($wgScriptPath, $wgServerName) ); + $this->assertRegexp( '/_session=[^;]*; .*UserID=[0-9]*; .*UserName=' . self::$userName . '; .*Token=/', + $cj->serializeToHttpRequest( $wgScriptPath, $wgServerName ) ); } } -- 2.20.1